From e439e0b289e3590f84836e4f9bbdfa560c7af6ef Mon Sep 17 00:00:00 2001 From: Mukesh Rathor Date: Mon, 25 Nov 2013 11:20:06 +0100 Subject: [PATCH] x86/pvh: change epte_get_entry_emt() for pvh mem types For pvh guests, epte_get_entry_emt() is incorrectly returning WB for all mem types because of the following check: if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) Skip the check for pvh guests. Also note, MTRR ranges are not maintained for pvh, and a solution is being contrived using PAT. Signed-off-by: Mukesh Rathor Reviewed-off-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 4ff1e55fd3..9937f5ab93 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -693,7 +693,8 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, ((d->vcpu == NULL) || ((v = d->vcpu[0]) == NULL)) ) return MTRR_TYPE_WRBACK; - if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) + if ( !is_pvh_vcpu(v) && + !v->domain->arch.hvm_domain.params[HVM_PARAM_IDENT_PT] ) return MTRR_TYPE_WRBACK; if ( !mfn_valid(mfn_x(mfn)) ) @@ -717,7 +718,10 @@ uint8_t epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return MTRR_TYPE_WRBACK; } - gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); + gmtrr_mtype = is_hvm_vcpu(v) ? + get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)) : + MTRR_TYPE_WRBACK; + hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } -- 2.30.2